Final comment updates