added bufkill + binding, some other adjustments