more plugins and changes