Safety/efficiency improvements to simulation construction