Fix several annoyances. Add new favorite mappings.