update Simulator, cleanups