A few additional edits to chapter object and related.