Made some small return changes/general push