Updated index and fixed parsing errors