Fixed ag
Updated some mappings
More plugin mappings