Tweaks

Tweaks for test version uca09. 2-3 safe room is still being a bitch.