A bunch more mappings and removal of special case mappings