refactored another bunch of plugins -5 to go for launch