cleanups
fix sorting of columns