layout and typo adjustments from Mikio