made the rest of the edits maxim suggested