Some fixes
Implemented client