More optimizations in area 1 and a new trick in area 2 thanks to Elyot. The undo abuse was optimized out :(
