use ordered-list tocs, fix some bugs