small structure tweaks