Added some plugins, slight cleanup.