Some basic cleanup of chapters and toc

As the title suggests, this is a quick solution for #48.