Major update to responses and error messages