Mapsize stuff
fix stupid bugs. That'll learn me to commit without compiling.
Merge remote-tracking branch 'upstream/master' into minimap