integration and bugfixes