fixed up a few mappings