Minor tweaks and typo fix