easier buffer choose
misc fixes, better buffer cycling