typo fixes

a little intuition used in some changes so please double check
Merge pull request #1 from dsteinbrunner/master

typo fixes