Add completeall and fix remaining to show proper count