Add benchmark, and make bugfix associated with doing benchmark