more comments, and debug messages
(#388)