misc edits after reading it through