added some plugins and dependencies, some cleanup.