more work on re-adding survival-mode crap