syntax and traverse fixes & changes