fixed string null checking (.empty) & struct_name is now of correct type.