Patch by Rob Landley, work in progress update, fixes lots of bugs,
introduces a few others (but they are being worked on)
3 files changed