some cleanup
some more cleanup + some new plugins