Fixed papercuts.
Fixed more papercuts.
Merge pull request #39 from snwh/master

Mostly papercuts.