Added back bufsurf plugin, misc. tweaks