Fix warnings, include, and previous merge.
DigCapacity. Digging diagonally must be fixed when the collisions are fixed.