more minor stuff all over the place.