button fixes and other stuff