Now syntax highlighting fully works
Small changes