most of Damon's initial edits addressed, still need to edit Makefile