fix + structures + corrections