client update

- Makefile update
- copy/paste and other mistakes fix