update plugins into the site
Updates for v2 and some tidying up