Fixes to pattern matching in CLS
Fixes about primary constructor in CLS
Updates and fixes to CFR-1