Other cleanup

Also added color to Makefile output