Updated plugin management

and did lots of other things which I dont remember.