more benchmarking tools, changed back heuristic for bfs
merged