fixed some return statements