several bugfixes
Merge branch 'master' of https://github.com/toddan/LattJobb.git