messagelayer and bugfixes