Fixes from James H to the numbering of squares, in particular: