renamed and added required and error messages to client section