Minor fixes and typo corrections, following the previous commit.