minor changes to simulator