fixed standards
fixed messages
fixed the construct