Some comment updates, mostly.