fix ugly code and 1 person matches