some fixes in structure