Vocabulary creation cleaned out, well partially; digressed to work on other issues