more python fixes
Merging

Merge branch 'master' of https://github.com/rzhou186/Echo
Merging with Ray's

Merge branch 'master' of https://github.com/rzhou186/Echo