Sim fixes

Some miscellaneous fixes to make the simulator easier to use