added lookup, changes to short-word finding