minor logic changes with big effects.