bug-fixes and benchmarks