changes
fix bug where errors were not being shown to the user
Merge branch 'prod'