Some more advanced completion; cleanup needed
Implemented error hightlighting