Makefile now working nicely