fixed up mapgrid, merged package