Miscellaneous cleanup and fixed missing dependency.
Updated Makefile and README.