many comment updates and additions