misc
further improvements to plugins