adding messages from tools, some bugfixes