A mess of changes

I have no idea what changed since Thursday