fix messages and comments