events + bugfix