minor edits, mostly cleaning up comments