updates to handling of downloads