Add auto-makefile finding, and other improvements