consistent names for event types;
test bugs regarding quit state fixed;