add yhat tools and clean up data