Map Update

Fixed collisions.