fixing esckeys and some more mappings