updated and tuned things using the simulator