Added more events. Found a bug.