fix all the errors...