Improved hexagonal state handling
A bunch of tweaks