cleaned up, added makefile