Various updates

More files have changed than I had expected here. I must have forgotten
a commit at some point.