fix json format
more linking/formating with server