fixes and addons