minor problems with button presses fixed