Pimped the makefiles