rename some, and update easing code