Added some plugins, cleanup