Fix removeEvent, update addEvent to keep view context
merge copyright