some changes to the makefile, not finished