Added a few more shortcuts.
Resolve conflicts.