A few bug fixes.  Needs more work.