Fixed json, typos, etc.
Merge pull request #1 from till/patch-1

Fixed json, typos, etc.