a couple new plugins, a few mapping changes