Added preview to report Makefile. Switches tidied up in general