various bug fixes, Morten og Erik
Merge branch 'master' of https://github.com/s114898/30010