Added more plugins, minor tweaks