Small features and a few other reworkings.