Small improvements.
Further Makefile improvements
Small Makefile fix.