Added new event feature
bugfixes