Yet more work with tbprobe.cpp