Minor fixes and edits