Final touches on codebook