fix completion and words