clean up and add some useful plugin