fix tic/toc + ph2thomas
cleanup