fixed syntax errors, test suite runs