Filling in some gaps; tidying.