Small improvements and typo fixes to last commit.