Fix hole 0 bug

Also improve ux