small tweaks
other small tweak
looking at another ex. some issues with returning more than one possibility.