fix some mappings & add some aliases