more hci improvements