Please pull - map array was indexed wrong all over the place

Some of the array stuff was indexed wrong, but worked since width and
height were the same.