another bunch of plugin changes