more tweaks to structure's models