Oasis changes

Many changes to Oasis map.