fixed some bugs + create new events