Bugfixes, reordered columns