Add messages
Bugfixing