Various changes/fixes
Merge branch 'master' of github.com:niive12/interflex