Structs

Other fixes