More changes

Too many to document, I'm already late