I didn't get as much done as I've hoped but there's a few important 
fixes so I'll repost early.  Apply to a fresh CVS copy.

John