slight structs improvements