more codebook tweaks