Updates

Merging in the plugin updates