Timer & beep fixes