Minor update

1. list of string instead of client(easier searching)
2. other minor updates