Minor corrections and typo fixes. Should be my final commit.