Global variables now ALL_CAPS
Substring search now returns possible hits if more than one found