plugin update + small changes