fixes and makefiles