some refactoring and some bugfixing in /current/event