Added debug switch to the Makefile
Minor changes