Major updates
Revert "Major updates"

This reverts commit e03298037741176476f3778cc6e6a9d9ccfec65c.
Major changes - need testing
More major changes
More changes
Untested changes
Few more
traversing.js bug fix