added message to words
few more fixes