A few fixes

[lgauthie]

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

[gregsexton]

Thanks for submitting this. If you make the changes that I've asked for then I would be happy to merge this in.

[gregsexton]

Thank you for this!