Fight messages enhancement/bug fix

Please check commit messages.