more tweaks to structure