Fixing conflicts with plugins
Adding some more plugins