added some more mappings etc