Small edits, added TOC and played with headers