Many more changes, including tab-completion of tags