Fixed the no-name cases and the Comparator