Small tweaks to the Makefile and more targets.