Streamlining experiments in benchmark.py
Merge branch 'bugfix' into clusterfix
Code clean-up and streamlining.