More touchups and a bit more work on Ch3