Added 'diff' target to Makefile
minor typos and fixes resulting from merge stupidity on my part