Prepare for simulation
Graphing improvements