New events, fix little event number bug