Some changes to style, typo fixes, etc.