r2 -> ahbot improvements