fix weev wing
better json
Merge pull request #119 from washort/json2

JSON changes