Updates for re-submission

Essentially included codebook and comment updates as core code remains
the same.