* Somes fix and add

- No more autocomplete, maybe later