Plugin changes

This should cover all of the changes to the plugin files.