Perms before Terror

Permanent effects now apply before the Terror event, along with a few
other small clean-ups