fixed error messages
fixed standards