Edits and fixes