fixed problem with benchmark, made a few tweaks