fixed column order from a botched reset of my master branch