Initial dist subtree commit
adding some fixes