fixed lots of event stuff