Some more rewriting of logic of where the stuff is found - hopwfully things work now.