better makefile
more makefile fixes
more fixes
more fixes to the makefile