Fix some nonsense relating to column numbering and allow multiple ORDER statements