Simulator ViewModel and Model minor updates