Changing branches

Sea, desert have been modified, problems with other areas hopefully
fixed with this commit.