Few bugs removed from client.