more integration and bugfixes