Small fixes and edits