added a Makefile; some cleaning up