misc edits + formatting