More traversing fixes

Think I have it done.