Tweaks to covariance model (hopefully making actual covariance
matrices this time!)