added addons and made some improvements