Initial dist subtree commit
fix sort