Grabbing json too, corrected some file comments