fixes, buttons added