Merged minor modes, added new commands and keys.