bugfixes, plugin system upgrade