large improvements in benchmark framework