various edits, typos and cleanup