fixed error EOF
Better json responses
fixed merge conflict