Various download-related fixes

The primary purpose of this topic branch is to address #11.