debug track til smartfind + small optimizations