Random stuff

Random changes lying around since the last time I played with this.