more tweaks and removing the plain plugin