various bug fixes
Merge branch 'master' of https://github.com/zigapk/GimVic-suplence-android