buttons, buttons
Minor fixes