fixing GetEvents, and few other fixes