Added some fixes to routines (fix tauBenchmark before forgetting about it!)