Fixed more main structure.