Woody,

I'll pull your suggestions together and post an update.