And.... Started syntax error fixes