should fix all but one of the errors