Fix up cardSuitSort() function to be less memory intensive.  Fix up some TODOs.