Misc updates. Now has an incomplete makefile.