Fixed messaging

Fixed messaging and etc.