* fixed Makefiles and some clean up stuff