first round fixes for livetest
Merge pull request #102 from nilxam/update_distri_0820

first round fixes for livetest