Apply BnB Zombie Awareness Tweaks

With a few deviations of my own.