additional minor edits and final cleanup