Incorporate stats fixes from @leewillis77's PR.  Mega-props to sir @leewillis77