added NameComparator, reordered Parcel passing fields