Some updates and autocompletion