Bugfixes & Events added