added bufonly and changed tabs and buffers