More work on plots
Merge pull request #28 from nelswad90/master

More work on plots