fixed all the errors, again