Small improvements to the Makefile structure, still not 100% right, but OK...