Fixed most sizes for #7; some still not working