Add Sweden and Japan

Some style changes too. Fixed GB