Update logic for checking fields, ensure data passed back in fields, correct error throwing and success JSON, typo fixes