Add completions.
Fixed syntax error handling.