fix toc and add Q & A