Fixed syntax errors

Fixed many syntax errors in the last commit.