extended benchmark, many improvements