better messages, bugfixes