80 - various changes from 80.230 to 80.245
Merge pull request #231 from mattrebor/chui

80 - various changes from 80.230 to 80.245