Hamels on shoulder: 'I feel a lot better'