Structure and section tweaks