Fixin' up stuff from the hackathon

Oh glorious tabs, how I missed you…