Fixed both makefiles a little, added a main one.