adding some fixes
Initial dist subtree commit