Update comments
Update Codebook