Added auto-, cross-cov and changed auto-, cross-cor