SIMULATOR and GUI: All settings exposed in GUI and can be changed on the fly. Cleanup of simulator code