Progress in structure and few fixes