Made the makefiles better