Fix bug in C++ simulator
Clean up Python simulator
New utility functions in PlotTools