more download q concept cleanup #14