Made many changes that facilitate the addition of mountains.