Client running. Fixing bugs