A few fixes

- Move the rest of the <ctrl> based overrides into the <ctrl> conditional
- Add mappings for n and p to move between commits
- Fix using += for string concatenation.