Clean up makefiles, make deps, improve text output