updated to included makefiles