More improvements to the cc mode