fixes on structure