misc edits
finishing edits