more structure tweaks