Backwards chaining improved
Another set of improvements
Cosmetic refactoring
Merge conflicts fixed