better map stuff, and better data fixed