Misc qev->q renames with a few type stuffs
Add json