Fix syntax and etc