improve autocomplete; fixes #12 and fixes #13