Bug Fixes and Cosmetic updates
Merge branch 'master' into model-changes
Merge branch 'model-changes'