some major addons and fixes