Added progress bar and minor improvements