clean up some of the makefile; move a couple things around