Add autocompletion, improve some stuff.