Small updates to displayed text and next_fetch calculation