added previously missed review comments