[WIP] Updates to previous PR

Mostly minor things (e.g. implements #104), also explores new covariance estimator code.