New plugin, tweaks