completed content-actions.t and other tidies