fixing syntax errors and adding highlighting