various messages fixes
Merge pull request #353 from necrodoom/patch-61

various messages fixes - This better work!!!!!!