fix messages and commands