Fix grab and improve tuner