Add Plugins
Clean up and update rc