Added norwegian date, and some refactoring