Initial dist subtree commit
fixes configs