more comments, cleanup, etc.
(#618)