Fixed more client code
added json