First-round fixes

Labels via tables, formatting, etc