Correct parameter names
Fix typo
Implement completion hook draft, add some TODOs