Variable maxX and maxY for toroidal calculations
Modified relevant scenarios to be toroidal compatible
Simplified goal and checkpoint setting