minor edits in preparation for massive overhaul