update return values to be a little more consistent