style and bug fixes
Merge branch 'master' of https://github.com/Merikotkat/Merikotkat