Fix remaining tablesort issues; closes #10, closes #9