structure: more improvements