Reordered handlers, cleaned code, fixed probe selection