Small bug fixes to plotter, parser and utility
Fixed merge conflict