Updated puppet master.
Added phrase subfield, added some filters.
Organized json file a bit.