Tried to fix some of the errs