tweaked plugins and mappings