Minor fixes and updates
Merge pull request #9 from wri/feature/cleanup

Minor fixes and updates