added more charts
consistent quoting in generated json