Work on plot, abstract-thesis and improvements to error handling