Various changes, plugins added and removed