back to basics
cleanup
fix TOC