added support for autocompletion, still not at the level it previously was