We're prepping for a conference, so it's going to be a couple of weeks before I'll have time to look at this again for a rewrite. I'll help after I get back, though, if the work isn't done by then.