comments and typo/spacing fixing