[WIP] Clean up argument order mixup
[FOLD] docs