fixes, new buttons and some clean up