master: comments, cleanup, and such.