minor cleanups and text edits