minor fixes
Merge pull request #1 from kjbekkelund/master

Noen småting