all errors fixed
fixed few more errors in cz.ts
merged with Michael