Update docs & comments.  Misc cleanup.