fix bugs and addons