As always, tons of changes without recording what was done