Various style and typo fixes