very minor cleanup
more hyperbolic and parabolic motion controls