Fix acceleration and velocity limits.
Sync some other changes.