mostly working
Merge remote-tracking branch 'origin/restart_remove_on_death' into more-camera