Woods in much better shape than last year, when he walked off at Doral