Curve: one more clean rewrite (don't affect iterators)
small bug fixes