Fix up default sort column and readd all the bugs.