Track reanimator bonuses + various internal changes

Fixes #114