Minor changes + CodeBook

Added the CodeBook, and fixed some minor types.