updates and fixes
Merge branch 'prod' of github.com:ryancangcoii/uat into prod