Update to error messages
General updates to support both valid and error validation
Included validation updates in demo template