Minor fixes, added progress bar