many plugin updates
more plugin fixup