Fix more getters and a few typos
Merge remote-tracking branch 'upstream/master' into getters2
Merge pull request #94 from oakes/getters2

Fix more getters and a few typos