Fixed most of structure problems.