ETA Logic

Seemed to me the eta calculation was moving around wildly as there wasn't a proper moving average.  I patched on my end and though you might want to incorporate.  If I missed something here please do explain.

Thanks,
Shawn