Small tweaks.
Merge pull request #1 from ScottBouloutian/small_tweaks

Small tweaks.