Add simple makefile.
Some cleanup/ fixes.