Updated in one big push for report 4. Fixes to come.