committing before switching from saving last known good position to using future estimated position
fixed a mountain of things