Minor tweaks and progress bar