Added Norway
A few bugfixes