fixed some missing returns