fix commented out errors and syntax errors