More Plugins and some cleanup