Tweaks to events because wow, that was out of date