Updates #24 to sort on full english name rather than the first word and fixes some issues