small changes and upgrading to java 8 for the plugin