Adding United Arab Emirates and Dubai
More cleanup