#42 differentiate dictionary vs. numeric sorting
#61 add expand row unit tests
#42 cleanup