fixed typos; merge classes into a single json foe;