Changes and fixes

Signed-off-by: Dag Henning Kalvøy <daghenningk@me.com>