Fix more Mac formatting and TOC