minor edits, now complete