More changes to the kitchen-sink section