some bug fixes etc
Merge branch 'master' of github.com:iNZightVIT/iNZightVIT-WIN