updates from plan 9
4 files changed