Scaling changes and Hex fix

Scaled up the rings and the level to perfectly match the grid
underneath. We need to keep any and all changes in s1 in this commit, so
sorry if this overwrites
resolving conflicts

S1 conflicted as expected, but the T34 prefab also did so whatever was
done to that needs to be redone