Rework combat events, track buffs, and fix time