Added progress bar, minor improvements