Swapping x and z around to better convert maps from PICT to pavara. Also fixes an issue with headings