cleanup
cleanup
added some know event types
fixed stupid exception
fixed stupid exception