improve gather_buffers
nmap O[A-D] [kjlh] (fix #33)