fixed syntax errors, tests passing