Added some nicer plots and improved some of the code