Add several new territories, changing several ISO codes, make small corrections and optimize map