Fix typos and improve some titles