Makefile fixed, cleanups, first working version