Improved loading progress display

...and minor code improvements