Even more changes

Too many to list