still fixin json issues