changing things with json and fixing issues