Use all values axes to calculate increments.
Fixing bugs and code cleanup.