some minor file-list fixes
some minor file-list fixes
solved merge conflict
fixed a bug in sort section and identified a new one: the last column is currently only sorted with a crude hack