~ improved makefiles