Some patches by Drew Csillag; plus a few of my own uncommitted changes.
2 files changed