fixed some return values