attempt fix structure and format glitches