switch back to native buffer closing and swapping
change micro mark match mapping