Initial dist subtree commit
touch ups