Continuing tweaks with saving JSON