Overall improvements to the plugin