fix
structure fixes