Fix somethings syntax errors and others