fixing syntax errors, post smoke test