Small changes + removed json-lib