Various tiny tweaks
Merge pull request #421 from jblaine/patch-1

Various tiny tweaks. Thanks -- Ward