FastSim and aesthetical fixes