More work with tbprobe.cpp