minor changes + section 'datahåndtering'
conflicts resolved