Add more countries

Japan, Mexico, Netherlands, Nigeria, Portugal. Some cleanup for Italy
and Brazil