Refactor "magic numbers", make the progress bar move smoother and fix a
bug where only one third of the progress bar was being used.
Merge branch 'various-fixes'