Fixing syntax and grammar