Make methods const
Fix hole generation