fixed cleanup, add makefile