Minor improvements.
Merge pull request #1 from dahofer/minor-improvements

Minor improvements.