A couple conventions and typo fixes