fix autocomplete and add misc staff