fix hang, etc
5 files changed