add new files; fix bugs in clients