Corrected input units
Merge branch 'EKF-Revert' of github.com:jemofthewest/DOECPF into EKF-Revert
Made my changes per John's request