doc: CC map tidying & fixes