Fixed a lot of issues with the plugins and add forms.