Update plugins and fix some javadocs