Fix few typos and improve markup at some levels