fixed the numbers of CR and some linking