More tweaks for switching to hexagon/bigon