Fix comment highlighting, add addition operators that were left out.