Reworked events, typos