[0.1.3] Don't need to JSON.generate; fix misc bugs