Major StringSort changes