Another week's misc changes