JSON fixed and some warnings cleared