reworked makefiles