Mostly cleaning out the cruft, and straightening comments.  I expect to merge this branch back in soon.