updated makefiles , everything should work