working in yearbook: many small fixes to data structure expectations