Changed some titles, improved the heading hierarchy