Further enhancements in download script.