fixed events bug
made events cancelable
updated to new code base