reworked the TOCs a bit