Fix for messages and adding comments