Fixing for my own use.  First pass.