cleaned up, added Makefile