These changes have been sitting here uncommitted for a couple of months here, I don't even know what they are about any more. I probably started working on something, then got bored again. So here is some half-done changes, at least they don't seem to break anything. Have fun