some fixes
more addons