Fixed syntax errors, and function names