Codebook, comments and fixes