updated to fix some widths