Removed temporary delay counter, fixed problem with returning from the button interrupt handler.