fixed up all syntax errors, moving to testing