General little fixes and edits