fix messages
some fixes (don't remember what)