Whitespace and variable name cleanup, more graphs, better default filenames