More syntax errors fixed