Added Makefile, minor tweaks