modify some bugs && add back to toc