Reworked CodeContracts and Check
CA/SA fixes