moved TimeStepControl to Simulator::run and make it work again.