fixes to structure