Adding a couple of suggestions, and fixing invalid json