minor bug fixes
Merge branch 'master' of https://github.com/rn1x0n/SwissMortgage