added support for new plugins, bugfixes