Extend some keymappings and add some comments