some plugin and mapping updates