* Makefile changes, coloured terminal output added, some variables fixed