returning plugins with some bugfixes.