Fixed some errors, new JSON parser

Switched the JSON parser from quick-json to org.json