arranging map matrix better, hopefully