Revised the Makefiles a little bit