fixes and bench_ready