Working n/p and o/enter

Having never used this feature, it is perhaps different from the GR
implementation. Will fix based on feedback.
Update