fixed some stuff that was broken by previous merge
updated client to parse new json package