updated Expectation, Covariance class: included normal ordering features