Makefile for all of this.
Miscellaneous changes.
Merging.