events-major2+cleanups