corrections to markup (adding divs where needed), and adding norwegian-specific fields