structure  fixes