Topic etdep ecorr

Missing pieces from previous pull .