Issue # 19 JSON validation and few updates