Map Update and Boundary Fix

Not sure if the boundary fix is completely correct

Reduced size of map to make animation flow better