improvements

Signed-off-by: maxkoenig <max.koenig@npolar.no>