Multiple changes

I lost track of what.