Corrected client list and changed findClient function

Thanks Fenix & Courgette