addons and small bugfixes