more plugin tweaks