Removed probe-specific code from the tool.
Removed return-while-off-plane bug.