various wee changes I should have pushed earlier.