Added first plugin and a few adjustments