finalizing json, some cleanup, added new fields