Matt Holliday on the comeback trail