Fix some mistakes and improve text layout.