cb and cheques, some rewriting and bug corrections