Comments and fixes.  Fixes and comments.