tweaks and edits throughout