Updated for CMOS type.  Scans not tested yet.
Bug fixes
Fixed some CMOS bugs.
Merge branch 'fs20_datastruct'