Some Bugfixes and listen to other event