Full data now in JSON.  Other small fixes.