merge from save238 - continued crash troubleshooting, subtracted respawn_changes