in sync with the trunk. Modifications suggested by Vasili and Harsh (some still need to be done especially the lemma formulation for greatest SKS/STS).