Fixes, Checkpoint.
Refactor, fixes.
Re-add argument value assignment.