small tweeks
restored download and hci_related