Improving Contrat documentation and fixed some properties usage