Further CodeBook edits