adding makefile, cleaning up a bit