minor updates on structure