Misc edits and spelling