bunch of event fixes/additions