minor changes

some minor changes to the simulation to prepare for presets and the
setup tab