bugfixes and message improvements