fix some syntax errors, etc.