Changed tree model to respond to event types independently
Added calibrate detector action and changed monitoring around