adding minibuf
misc edits
merge conflicts