remove debug, swap some columns