Misc. comments and edits