Latest bug fixes, added two more buttons. And other stuff