Improved all three jsons
refs #245