update key mapping, add descriptions