Minor cleanup before sending pull-request and after adding progress bar to
fiwalk tab