fixed completion, I hope.
merged diffs