fixed some mappings