further codebook corrections