More plugins, more fixes