Various changes from yesterday that were not commited