Fixed -s behavior. Now it works. I will commit this version now and start refactoring.
Done refactoring in REMOVE_MATCH(doNode.c) and sortTree.c