Updated plotting, output
remove accidental includes
remove unnecessary file