add debug flag to command line program
white space and comments
fixed up merge