Makefile correction, other sneaky changes.