premerge commit -smd
worked on active setting
merged chris and shane, fixed display inactive chkBox