More nits and small changes.