fix comments, minor cleanup