Clean up some column stuff. Still not great, but better.