Some cleanup, and testing out landing estimator.