Two changes

 - Fixes so that a mapping if buffer specific and not global
 - Changes a snippet from rq to only r