fix some return values and others