Fixed some JSON and corrected index