more bug fixes, DataModel update
Merge branch 'master' of github.com:CSTARS/AHB-PNW