don't really need to mention this
updating types, etc.
Merge pull request #3 from wfreeman/master

mostly minor updates