Typo & fixes