small cleanup
Progress indicator enhanced