Events seems to work
More event bugs fixed