Bugfix and addons