fix struct initialization
fix struct decl