More tweaks to structure.